[pull] master from php:master#538
Merged
pull[bot] merged 15 commits intoturkdevops:masterfrom Nov 15, 2025
Merged
Conversation
Fortunately, libxml won't allow _at this point in time_ to have more than INT_MAX/5 attributes, so this doesn't cause issues right now. However, if this limit is ever raised then it can cause an integer overflow which will cause a heap overflow. So future-proof this code by properly using safe_emalloc(). Closes GH-20472.
* PHP-8.3: xml: Use safe_emalloc() correctly
* PHP-8.4: xml: Use safe_emalloc() correctly
* PHP-8.5: xml: Use safe_emalloc() correctly
* PHP-8.5: [skip ci] Fix destructuring typo in NEWS and UPGRADING (#20488)
The flush functions always return EOF, even in the success path. The success path should return 0 to indicate success. Closes GH-20474.
This reverts commit 2513258.
* PHP-8.3: phar: Fix broken return value of fflush() for phar file entries
* PHP-8.4: Revert "ext/phar: Voidify flush function as it always returns EOL" phar: Fix broken return value of fflush() for phar file entries
* PHP-8.5: Revert "ext/phar: Voidify flush function as it always returns EOL" phar: Fix broken return value of fflush() for phar file entries
In 61884c3 I added these FIXME comments after I noticed that this would cause an assertion failure. At that time I did not yet know what to do here. I took a look at the code now and other streams return -1 and leave the file position untouched. So we do the same for phar. This fixes the assertion failure and subsequent crashes, but also changes one test output. However, I believe the new test output is correct. Closes GH-20475.
* PHP-8.3: Fix assertion failure when fseeking a phar file out of bounds
* PHP-8.4: Fix assertion failure when fseeking a phar file out of bounds
* PHP-8.5: Fix assertion failure when fseeking a phar file out of bounds
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )